(fill-comment-paragraph): Be more careful when

recognizing leading comment on code line.

diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 69cb7fd8d0619e275c5e394088c731e0f4bed708..7a794d67c5ecdc83fa9bc2317bbbcef3bf2395bc 100644 (file)
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -822,7 +822,11 @@ can take care of filling.  JUSTIFY is used as in `fill-paragraph'."
                             (looking-at comment-re)))
                 ;; We may have gone too far.  Go forward again.
                 (line-beginning-position
-                 (if (looking-at (concat ".*\\(?:" comment-start-skip "\\)"))
+                 (if (progn
+                       (goto-char
+                        (or (comment-search-forward (line-end-position) t)
+                            (point)))
+                       (looking-at comment-re))
                      1 2))))
           ;; Find the beginning of the first line past the region to fill.
           (save-excursion